Finish up first pass at adding Typesettings to project.