Added basic functionality.
Minor changes.