Added basic timing system