Working copy with 'outings' functionality.

Merge conflicts all addressed.