Started using the annotate gem
Added user model and tests