completed removal of login screen, refactored functions
stashing changes