Updated to cover Episode's 16.7 & 16.8, Sorry about that...