Split out TODO and add screen capture