Updates

Now at a very workable prototype stage.