Finshied except for comments and organizing