Initial commit of first changes. No idea exactly what's changed :P