Added editor thread, added account locking