Make equipment locators super duper efficient
Change Waitress workflow
Clean up some various commented out code