Yep, will add it when i figure out where to merge :-)