ome progress on #3