Working on converting the old code to our a new refactored format.