99% complete now :)