weight class is almost done!
Merge
change file position