Consolidated classes, added code to dismiss upon Return.  Working version.