Working on some controller stuff, cleaning up to match my new rules
engine architecture.