Started contract framework
Contract dev
Water level display improved
Small fixes
Plant dev work, timing work
Timing and economy work
Merge branch 'economy3'