Got collections and collection views working.
Merged collections branch in to master.