WIP app rewrite **doesnt work properly, revert for testing**
41 files changed