2nd pass of basic editor functionality.