Media Objects

Fixes #4