Random changes and tweaks
Totally change how promotion works