Update TODOs
Remove Q
Add comment
Tidy up
Add basic integration tests