Added controller and scope watch ;) Jonny would be proud.