WIP stuff for mpd