He slept 8:20-6:45 last night. It seems like if he falls asleep between 8 and 8:30 he is more likely to sleep until 6:30 or 7 which is an ideal wake up time for us.
We have a string of Christmas lights he uses for a night light. Maybe we will plug those into a timer and tell him to stay in his bed/room until the lights go off in the morning.