updated user model
added goal model and accomapnying tests