Tweaks to classes- added new ways to input/extract data