more Todos, cleanup
cleanup
TODO handling sub tickts
added plan for testing