Looks quite good.
Now fixing bugs.