Make modelify more efficient - going to disappear completely soon\! YAY\!