more work on lab generation and definitions