pushed more methods into classes.  Added volument controls