Added DRAW handling & initial EOG handling.