Updateable refactoring

Refactored code to implement Updateable, added new updateable list to
handle updates in main