Added PEER support, moving things about