Rewire Hartburn

This project consisted of a new extension, and existing rewire. 1st fix to 2nd fix and hand over.