Merging pull request. Components work in progress.