Cleaned up populators with stored(); RefSourcePopulator working, not tests