Finished initial work

Now to test