Adding parts. Buncha other changes.