Basic commitment stuff (wip)