Finished updating nomenclature, need to update a lot of various parts. not usable, but runs