End of this commit series. Next commit to change code structure

This code was faulted in nearly every aspect. Next commit to be reworked
from scratch.