Initial commit on implement_users branch

Working issue #4