TODO and feedback from Damian