add additional rules working tests green, now refacoring
add additional rules working tests green, now refacoring
done refactoring for now, it could be done better. Tests go to green