Added magpie 2 stuff into magpie 3 and finished