Working. None of Clay's changes in yet
Merged strings