Make some master functions live
Actually pulling data from db