Issue #21: Oh, cell phones

Issue 21 done