Various changes, still laying out the framework