Adding partially complete update logic/merge

1. Added the first steps of update logic.
2. Committing now to merge some overlapping changes.