Final commit

Last bit of progress before migration to HGF.