gettting closer
needs more testing/refinement but works
fix bug, hide feature