Closed a lot of issues tonight.  #22, #17, #16, #21, #6, #15