First pass of making editor work...