Changes for issue #3.  I just want to refactor user => user_id before
this goes LIVE.