Version 1.7 WIP Update 2