commit 2

3 parts done