Collaboration start 1

Nathan's laptop works again, time to update