First batch of stuff

@himedlooff @ascott1 @contolini
And actually, looks like I accidentally added it in a few places. Oops! Fixed now.