commit before working on expense and client scaffolds