added thetas and checking for partial completion. Thetas has NOT been tested yet