Got a couple thins working