add TODO. I think I need to handle this better.