Almost final - added to do for the rest