Working on adding parts