99% working again....

Almost working..