Feature #64, refactored controllers