Rules check ready, but still ugly...