Fixing a couple of bugs and, in the words of Håkan, 'moving shit around'
[contacts] Moving onto different ports s.t. we can test simultaneously