add test draw funtion
resolve merge conflicts