So very wip

Please DO NOT merge ;)