Implements initial placeholder behavior
Finishes placeholder implementation
Merge branch 'feature-placeholder'

* feature-placeholder:
  Finishes placeholder implementation
  Implements initial placeholder behavior