Rearranging + preliminary work for fires