quick comment/reminder: leaving this class alone for now