Simplified some code (is still wrong)
Made neighborhood view to work.