Updated sample project, implemented defaulting controller to current controller