partial changes, temporary commit while I'm at a bit of an impasse