Fixed to handle nil
Fixed to handle nil
Removed containers that aren't compiling