2/3 done with issue 3