Working on getting accounts to work, almost there, but some bugs