Make it eager, and add TODO