moving expression editor stuff into branch for now