Start local user refactor