Add TODO after first beta test