#10 work on editor mockups