refac refac refac
interfacing
base classing
removed dead functionality