New Account.cs Refactor