Finished the Media implementation (issue #76)