I got mine from Nick as well, but for the ones I needed were all waterslide. I also am currently at a loss as to where I put the headtube badge. It was completely worn flat, but that is certainly better than nothing. Have you found a source for those?