started offdeck
ready for testing offdeck
error handling
Merge remote-tracking branch 'origin/testing' into beta