working commit
cleanup
argh