Users working
User system mostly done
Merge branch 'sean'