Added controller methods, (UNTESTED). Need to refractor query setup.