Finished Tutorial 7

Added Singleton where necessary.