Took me a while but its done