Another try at implementing A funcitonality, since last time everything just died for some reason.  Removed instructor code due to request and included the switches in the UCF files.