Begun putting types into models