draw class changes

updated the code to contain my latest progress