Wow, that ended up being a lot of work.  Got everything to work server independent.