Add example user and basic refactors