basically finished. Now enhancements