Proximities fully added, but untested