Check detection works for the most part now.