Iteration commit - users api is broken at the moment, WIP