Work on finalizing user functionality