Made additions for part 2

Types still crashing