Much Re-org w/upperclass