Update to main, added login