Moving toward users implementation. All tests working.