First wave of changes for 0.1