This is a total rebuild