getting closer to resolving issue #1 :fire: