Initial work on 1.7 port