think I have it working finally