Tire branch

Merged Tire Aruwajoye requested to merge TireBranch into main

Both edit functions complete, will clean up code later

Merge request reports