General purpose commit; haven't uploaded this in a while.