Refactor model/controller to use joins for optimization vs many db requests

[rabble]

Right now we've making lots of sql requests for things when we could be doing much better with some join's.... this isn't a priority but we'll do it if we want to scale / speed things up.