looks like it is working, reverse and unittests need attention