Add some initial functionality