first commit

minor untested changes