removed work in prog, and todo