Mult instance refactor

Big changes, tests aren't going to work right now, as well as filters.  Next 3 pull requests will be merging in what the rest of the team is working on in to the refactor.