Further controller work, things are getting closer to working with the
new and improved rules engine.