WIP: after 20140609 meeting