More refactoring... deck stuff is working a more like it should now.