Moved evaluation to its own class