Add TODO, copypasta cleanup