Reorganized and implemented more of the extension framework.