Added some more to finalize for this commit.