added Student class
merge with MattY
fixed function calls