first update, issue 1 almost complete