Implemented some timing, not finished