issue #30 next commit this will be complete