(WIP) Work-saving commit