Fleshing out for wk2