Major refactor update.