Add TODOs, streamline menu, clean a test