Partial work on define.py