Remove references to diameter, so it will at least build
Diameter is still messed up
Diameter looking better