Completed all code, except classification tables