test commit
fixing some bugs, implemented Base Class