More work for 1.5, figuring everything out