Added some basic functionality.