removed abstract class stuff
cleaned up unfinished comment