Make code acutally object-oriented.