Work in progress on Rich to Simple pass