Refactor, add tagged and formula choices.