Lazy-mode solution to #3

Closes #3