Added media capture system to close #12