End of Day 2 (with some TODO's...)