Update

What I have done so far.