Initial media model and library
Resolve feature/media conflicts