Update for australis
WIP. Need to revert parts of this, too