Making progress on the basic structure