Too many errors in how I'm currently handling these checks. Commenting them out for now