Implement stories 1 & 2