Started work on update for 1.5

More changes to come