first commit for issue 230

Used to evaluate the progess on this issue so far