Second draft of master's thesis