Merging Kacy's work into git.