Broken. Started working on reducing duplication in getting return types, and identifiers.