kindof done with my half of presentation
merged presentation changes