More updates.  Ruleset near complete. WIP