WIP

Broken in trying to apply generics