Base batch equality test working
Removed lots of redundant code
rewrite of penalties in progress