Im closing this as it has been merged.