Bloodstone

I'm starting a pull request to track updates to the Bloodstone branch.