All the UMLS and everything

This is what was handed in, but I guess we'll touch up some of the
errors we found and stuff