Finished changing to object model.