Renovations - The Real Deal

OK :hand: hammertime!

Includes pull request #4