TODO update
Make the TODOs a list :octocat:
Merge branch 'develop' into tests
Uncommenting code to test