clean up and simplify. add command pipelines