Initial work to add follower functionality