User Module initial PR

Warning 42 commits ahead.

<!---
@huboard:{"order":69.75,"milestone_order":2.4375,"custom_state":""}
-->

Earlier (above in the review) you compared this against the `1` string and now you compare against the number, which is the right one?