Add TODO and monad comment