Very late to the thread, but adding the different cups as runs would be good!