Nicole's Update

Outgoing - no query yet
Expenses - no query yet, no validation yet

Ready for Clone - all files modified by the collaborators were merged
here