Looking for ideas for making this better. Already spent a bunch of time on it.