Clean up class 6
Initial commit class 7
Initial commit class 8