updating user model
adding stuff
debugger
fighting with linker
merging