Finished, I think... should be good enough for first task commitment, we
have to doublecheck a lot, though, before handing in the next part.