Done. I'll push later (gotta go give a graduation speech right now)