Added all of Day 2 functionality