Second pass at Michael Hartl's app