Added some more base functionality.