more work on final

only things left is testing and cleanup
idea/workspace file