V2 Algorithm Testing

Working towards a better critical detector, although random testing
still doesn't do what I want yet.