attempt to resolve server loading issues, temporarily move logic to views