Added wrapping and rewrote neighbourhood watch