Issue #93 implemented, Issue #97 WIP