finished resolving merge conflicts
Fixing the component parts of destructors, making sure things work