Almost finished?

added magpie2 changes