Restored functionality back to working levels.  Scanner contained in class.