started working on #21

- As discussed