Finished section 2.2
Fix broken merge