Added a few parts and initial assembly