Prefabbed it up...

It's fabulous.
Fixed Merge Conflicts