My work on a  different problems so far. Unittests fail.