Refactored module to start to not be horrible.