Add a few more things to TODO
Add feature file
Tidy up feature file
Format the go code