Multiple layers of generics parsing added, need moar tests