commiting some old stuff that I have not looked at in a while