Completed assembly handling refactoring; passing test cases except pipeline & design TODO test cases