Alright it's really done now (aka i guarantee i'll make another commit)