Incremental Update

Will be broken out into smaller reviews with proper commit messages.