Start rebuilding on the nearly object-oriented base