Began greater refactoring of this here baby, because it will be better in order to get the job done