Pretty much fixed up for export to other projects.