Update #78 add TODO, and prepare new Cyclic