re-wored
lots of tests