Last week's homework

Hey Ben, pls see commits:
d58397821f8e3b4ad70df29e468c80fadb4c1b34
73eccb51e26ad58e20f36d449212a10bb5286e17
:)