Making this not a hack