fixed edge drawing.  Work on reorganizing..too many classes