Huge commit; updating source.