Minor update.

Started working on creating objects to represent everything.