Add a TODO
Add some TODOs
Make some validation tests a little stronger