Working Out Some Design Problems

UPDATE: All Set, hopefully that's a little cleaner, a little less clunky, and faster loading.

Working out some design problems, I'm slow and ponderous but I should be done later tonight, so please excuse the very temporary changes.