More Progress on 1.7 port Blocks almost done