multiwords done, refactoring pending