Commit some work done after meeting with Philip.