Issue #15 WIP. Needs tesMore tests