Finished first draft of classification