Added FunnelController, slight refactoring