Overdue commit; everything seems to be working...