Full feature set - need full test suite and refactoring
My handed in project