I'm not stingy with commits, at least not yet