Finished majority of component adding/removing.