Day 1 - Arrive in Addis Ababa (fly in on Ethiopian, as if you do, you get discounts on intra-Ethiopian flights). Settle in, go out if you want! I went out and met up with some of the people going on the organized trip with me the next day -- the tour company connected us.
Day 14 - Touristing in Addis. Went on a food and coffee tour with Addis Eats. Would definitely recommend the coffee tour! The tours go relatively late into the night and also include desserts.
Day 15 - Went shopping at the traditional Ethiopian markets in Addis for souvenirs/clothes. Went to more museums -- there are lots in Addis, so choose the ones that fit your fancy. Went out again at night to eat with my new friends.
Day 16 - Pack up, sadly depart Ethiopia -- my favorite place I've ever been!
If I'd had more time, I would have also added in a trip to Harar -- I've heard the architecture is beautiful, and I would have loved to see the hyenas who have bonded with the people there!
How'd I get around -- mostly walking in Addis (may have taken taxis? not sure), otherwise either organized tour or flights.