[WIP] Updating account listeners, refs #57