@danlipsa this is the rest of your PR that you merged before I got a chance to push it. Please review.