EOR complete

Everything all set for testing!