Move a few things and uncomment handlers from first video