working!

Need to fix colour gradients though