Properties change for the new branch
Major changes to the models
Minor changes
Fixed default location and changing location + username