commit 3

d
commit 4 - base completed

cc