Main commit with completed work