Add TODO items from mechaet :)