Added more basic functionality.