Working on #181
Partial work on 1.5 changes