Zaahir/continue pr 59

WIP.

Moving #59 to a local branch so it can keep up to date and hopefully merge soon