Added a few more matchers... Not sure if they will work like I want them
to, but practicing my Python has been fun