Cleaned up adding new peer code