WIP of simplifying the app