creating my evaluation squeme
reorganized some code and made some tests