Modified registry to look up models by convention
Almost have my API redesign working. 1 more test to go...