Getting there

I've added most of what I want. Now tweaking.