Initial patch submitted for review.