Added test functionality, need to build grading

Just need to heavily test and add grading functionality