Stripped out custom types and just passed back as primitives, js will sort out
Completed removing all pre-defined types
Fixed up link function