attempting to merge with upstream for week 5 stuff