Refactor, state, work on admin