Ugly code, but peer works for real now.. ;)