conversion work completed... still want to test things a bit