Start of invariant detection
All the things
Fixed merge conflicts