Still lots to do on updating and adding rules -- but this is current progress