todo
Much nicer dealing with deleted things