How should I structure this instead?