Added in user settings, security not added yet, started refactoring code into separate files