Bring over some old code