WIP; cat quest.
Merge conflict resolved.