removed the dummy classes
continued implementation