Syntax
Refactor and start to add users