First batch of stuff

@himedlooff @ascott1 @contolini
Should we make this a block that can be overriden by OAH? This way they can easily exclude it.