Implemented the Upgrade header
Implemented Warning header
General clean up and refactoring