More drawing work. Need to refractor.