WIP: Finish commit