Great!
Yeah, I looked at it and it would require me to re-architect like half my game. :/ Sorry, but I think this will need to stand as a monument to my noobishness when it comes to coding. Next game, hopefully I'll make fewer silly decisions...
:/
So are you ever going to fix the other stuff, or finish the story?