close to working version

still lots to do but think I'm done with it