finishing refactoring of quartermaster and transactionable