Finish architekture for exercise 2