Trying to get a minimal sanity check in place