@brettchalupa for sanity sake, it's probably best to fix everything right now in a single commit and then be correct moving forward