Finalizing refactor
Adding file that was accidentally ignored.