Feature/now 320

I haven't been able to get unit tests created as I haven't figured how to get the sort param injected. I'd like to get this merged over into develop and then work on the unit tests later