API cleaning/breaking up
some comments on ideas
Merge remote-tracking branch 'alex/alpha' into alpha