Updated to include a basic test of functionality