Really should just use the object model here.

#675