update to 1.7, hilarity and bugs ensue!