Checking in some stuff

In case I can work on my laptop while on vacation I'm checking this in.
It might not work 100% though at the moment