Final commit of this scrapped branch.