First batch of stuff

@himedlooff @ascott1 @contolini
Can you remind me what we need this for?