Added On-deck functionality
Merge pull request #182 from deini/dev

Added On-deck functionality