Code base refactor. Much better now.