Looking for advice on how to organize this better