Continued to rework the code.
Continued to rework the code.