Working on promotion
Promotion now works
Resolved a conflict