yeah looks sweet, kill that and I'll merge :)