Update 1

Changed naming, window procedure handling introduced