Add timelaps button and review architecture