Yes! All of them will be included and somewhat Bathtub Map in 2.0 Update
That's amazing to hear, will the A.I be updated or given more options to do things such as patrol, or like hunker down in a specific area, as the A.I are quite wonky at some points, but other than that I appreciate all the effort you put into the wonderful game, as it's my top spot because of how fun it is.