Updated TODO - many things, lunch time