7.x 1.0

Please don't get this in, i need to rewrite everything into one single commit