More commits stuff, all untested