Testing character ideas
Fixed merge conflicts