Thanks! lets merging this then and will deal with all in another PR.