Stop using userdata

Added fab functions to move userdata functionality to fab
this should be passed in to the initial fab script