add TODO
fix imports, cleanup