issue 1 & 3

issue 1 done, issue 3 partly done