local changes
merge
drawing module
osx checked