Completed initial functionality. Tests complete.