Starting to offload collision handling to the individual states too. Toying with .gitignore (based on examples available online).