Cray cray refactoring. Adding users too.