distinguish between contacts and organisations. closes #2