Finally router/controller approach beginning to work