mergig both classes into one file in order to easily export to window