EOE Commit

Much Working