Coordinatework

Cleans up the left over generics warnings and corrects some invalid generic constructs present after Encoder generics fix