First batch of stuff

@himedlooff @ascott1 @contolini
Good catch, thanks!