start to make more usable/re-usable