Simplify the heck out of it. Changes logic and matches to be much more strict