Changed TODO's, finished guarded pattern