commit test
Fixed names and finished class. testing code outcommented.