Add PATCH capability
clean up structure
remove
remove
Add TODO
add working test
moar tests
Finished tests
Merge branch 'feature/testing' into develop
update files
Merge branch 'develop'

Conflicts:
	.travis.yml