Some progress on master branch.