Completed first draft rules extension