Started reorganizing app flow, still have some work to do though, app is completely broken right now.