sorting this out now myself and then will merge.