First batch of stuff

@himedlooff @ascott1 @contolini
Right, I guess I was thinking more about if we even need this in the template.