I really need to rewrite my entire code-base lol. Okay, not the entire thing, but my graphics, audio (non-existant atm), input, my file system, and my state system...so pretty much everything except for the really basic stuff. The worst part is that I had the design that I wanted to use when I started the current version that I'm using, so I don't know why I didn't use it then. Whatever; live and learn I guess.
First I have to finish I:FoM, starting with this map system. I'm not going to bed until it's finished. I'll post screenshots once I'm done.