Still big refactorisation. (walls and bombs)