Branch TR: Work in progress. Pre rebase.