Adds initial implementation
Fixes crash using empty string