starting on inline design tool, refactoring to support it
merge