Changes for EME
Got everything.me working.