More cleanups to come from Ed. This isn't actually working for me right now but he'll fix it now. This is completely optional and won't affect any other code right now.
