more deck type refactors - mostly convenience methods on deck