Hmm. totally forgot to commit anything. Here be the first fully working version