Several additions to the app, majorly overhauling the structure