collaboration demo

Hey Josh... I made some changes.
Please review and merge