Pre-Exam Update

Quick sync of current useful source before the blackout of exams. Left
out generator logic for now.