Quest Log YAY
Merge stuff