Have all code and tests working again, up until showing user || login screen.