Added cp and Timer functions
Merge pull request #1 from gillianzliu/master

CP and TIMER