Got basics done with single maths - now to remove sets :)
WIP-tweaking Details and tests