Alright, thanks for the input. I think I'll add a wall index and then start work on adding some buffers =)