New Headers Branch. Final version.

Added: branches/new_headers/