more work on basic functionality
.