some updates
Finished my part of GRADER
Merged all conflicts newest version?