Refactored to be more consistent with existing code structures
Merge branch 'feature/clipboard' into feature/tags