testing plan choices
removed prorate
Merge branch 'ordered_dict'
Merge branch 'trial_end'