moar refactoring and trying to get rbind to work with a data frame