More work on the basic structure
More work on the basic structure.