Got it 90% working