More work on adding parts