Finished refactor to prevent interference. Build now fixed.