wip
Intention works and tests added