We should be counting this.
Comments tidy up
TODO addition