In order to examine the best future solutions for convergence of Wi-Fi and 5G, this paper examines the current Wi-Fi interworking solutions available for 4G systems using either trusted or untrusted Wi-Fi access, through either Core Network based or RAN level integration. It also reviews the 3GPP 5G system approach to Wi-Fi access, which includes integration of untrusted Wi-Fi access in Release 15 and the new opportunities in Release 16 for trusted Wi-Fi access as well as wireline and cable modem access such as from a residential gateway. Release 16 specified Access Traffic Steering, Switching and Splitting (ATSSS) functionality is analyzed which enables data session over one or more concurrent accesses.