Final commit, specifications met