WIP
Fixed the merge conflicts
Fixed the stringify testing message