Getting ready to refactor some code and make improvements,

Here goes nothing…