Finished editing TimeList according to Olli's API needs.