added option to load from map from file

Still need to clean up code, but adding to master since it changes a lot
of code, that will affect a lot of people