Started implementing history construction