Merge pull request #1 from eyecatchup/wip/framework-base/alpha-pre

Make a (public) start..
Merge pull request #2 from eyecatchup/wip/framework-base/alpha-pre

Fix formatting.
Merge pull request #3 from eyecatchup/master

Merge back