Added more initial functionality.