Initial commit with selector options.
Merging remote with local.