refactoring draw package. Work in progress