Beginning to add neccesary changes for Custom Types

Beginning to add neccesary changes for Custom Types (build is broken for
now)