think I have it all working