Refactor before the mess of the oredictonary code begins.