stub editor, edit nanny, error handling
add shutdown
merge