WIP/falling asleep commit for #12