More work on base functionality.