Bigsky integration

At the moment this is up to date with bigsky as of 557a8d13adb1cca109b82541ea82faff96e0de8d