WIP - resolve issue 3