Folding my changes into the forked repository.
I had done a lot of work before actually making a fork. This is the beginning of the work being done here.