Pretty much done, probably som minor bugs though