Most of add part functionality
Most of add part functionality
merge fix