Fixed base class/interfaces. soon to use  makefile