90% complete..... :0