Completed functionality and refactored.