Refined Assignment class
Finished assignment 6