More work on various sections. Moving to another branch.