Finalized project 6. Misc work on project 7