refactors, pushing logic to user model
Merge pull request #55 from chandracarney/refact

refactors, pushing logic to user model