Refactor of how trick collecting works
merging