Further updates and fleshing out of concepts.