Start of how I want to structure the cleanup