still not working correctly, but tracked down some conflicts causing problems