First commit and nearly done.