Filled in a few TO DOs

still groking all the moving pieces