stay on target
Merge pull request #19 from mozilla/almost-there

almost there