Continued work on rules package