WIP for awakening refactor