Major changes, getting things reconfigured