commiting changes, things are pretty busted still