removed todos, since we won't be doing them
Merge branch 'tonotdo' into dev-gradle