Add notes from 6 and 7 chapter of Hartl's tutorial