started to tackle issue #15 and issue #16