Began work on traits and objects to handle updates