Working on fixing a fairly serious design lapse...