Done issues

issue 1 of 23