Work on the new framework classes. General cleanup and management of the code.