Blaze init

Merge Adam's changes to master