A whole bunch of changes to eventually support