Changed several classes to provide behaviour for tutorial.

Contributors: Özgür & Eric