moved things into correct util file.
find replace implemented