Starting over properly like Casper recommended

Deleted: branches/new_headers/