Merge Blaine to Master

Merging my offline branch to Master