Changed account handling

Changed the AccountController and Account classes a fair bit to make 'm
seem more logical I guess. From my point of way anyway. I'll discuss it
with you guys tomorrow.