Deck builder

Ongoing pull request to review changes