Working on adding users. Also did DB stuff