final update... mostly works