basic user stories completed (boo-ya)