add structured commenting for the TODO tomorrow