Issue #2 and #3 - wip