Commit 10 - buggy

Has its errors, but must be fixed