bug fix
stuff is fleshing out - still experimental