MASSIVE REFACTORINGS AND INSTRUMENTS GALORE