initial working commit
almost done
seams to be working
cleanup