Added two-stage addition and removal of components to ensure referential integrity during processing
Finished basic framework