moved class to its own file and included