Added some javadoc
Added basic user handling