Messed around with partials, controller filters etc..