First Commit

After some errors in what was supposed to be the first commit, this one
should work properly.