Close to solving a major bug. Have to change a good bit of code to do this.