Staged: Rule engine further work