Issue #26
Issue #27 - WIP