*should* work now - still testing