Build 2

Editor implementation