@hodgestar @justinvdm ideas on how to do this better?