#61 Adding lots of functionality.