Blockout Start

Forgot to create another branch. Updating what I have so I can work on
my own.