Added all the bits and pieces