Integration setup almost done. Missing stuff referred by 'TODO' tags