*-some tests added.
*-code still in an intermediate stage where nothing really works