somewhat of a refactor.
back the way it was.
functioning once again