much improved layout, not done at all yet.