Attempted to correct garbage collection...not there yet