moving things along with issue 15 and 16

Just a little bit of solicitation to move things along ....<br /><br /><br />