reduced the moving interface a bit, implemented the character class
Merge remote-tracking branch 'origin/master'