It works for now. I'd rather not rewrite it at this point. For whatever reason it might introduce the need for more testing/troubleshooting.