Commit 2 commit

First commit, buggy non-working version.