finished implementing first set of acceptance criteria