some reworking on simplified structure
simpler
moving along
moving to desktop
updated tests for simplified flow
added geometry to tasks and loading from graffle