Add remote indicator, closes #3