massive changes to build structure