question 1 done.  half of 2 done.
final commit for tonight