fixing bugs, adding files so pipeline can be split into two