Refactoring completed, one last midnight issue needed to be resolved