Problem 1

Commit 2