Branch/blockly preserve ids

@AmbientOSX @ajiraffe