Changed Structs for variables into maps

Woo, learning!  Maps are much better!