work in progress, addressing #12
work in progress, addressing #12