Add assignments, plus other changes