structure v0.9 - after first round of feedback