Adding Collection and fixing some stuff.  Playing with Angular.