Got the BO3 branches working

Many features are still missing, however.