Lots of big changes

overhauling the app