Probably should add the files

Also added unit tests of the string-finding functions