got 99% working