Cleaned up a lot of code, added in the name field to allow for account nicknaming.