switching to using struct to clean stuff up