refactored draw and discard, moved them to model methods