committing before leaving Dia
refactoring is going pretty well