work in progress pt2