Re-added lost stuff. Potentially final commit.
Re-added lost stuff. Potentially final commit.