deck refactor

Refactor deck to extend stack rather than contain one as a member.