i think all the pieces are there now