refactor & add drawing 3
finish soho hack stuff
create triangle from hieght data
fix merge