Added Controller logic and account management