Butt load of bug fixes but almost done!!