Starting to look over the code and refactor.