Modified strat2 not yet functional
Removed wrapper functions from this branch
Removed original strat function and replaced it with the current one
Added more data to test class with