WIP #429 New Promotion Rules

#429