Started more gradual reworking of unlockables - cleaner than other branch