wrong way to do this
update to classes