Added drawing mode, finished implementing rule-set