pre share updates

nearly ready to share with Uni SA peeps