Wrote specs and working on completion