Working on all the shop stuff