New version. Added walls, rearranged everything