Incorporate Will's Awesome Stuff