Ton of changes for 0.7.0