added some more basic functionality.