Added error checking, controller, item class, and base for account