Zillion refactors due to lockout AAAAAAAAAAAAAAAAAAA!