Stripped down some user features due to time constraints