I've added an issue for this: #121. I'm not going to address this in this PR because we need to make a separate pass through the code to beef it up in terms of validation, error handling, etc., so this issue will get taken care of then.