Adds control support
Merges
Adds missing music