commiting nicholas's latest stuff.