merging
merging
Added another model to track users