Refactor in progress, never lose hope.