Quick refactoring + starting real comparisons
Quickchange