Under Construction

The change isn't complete yet, but you get the idea. I'll probably finish up tomorrow.