OGLE partial refactor

Like the others, this is refactored just enough to allow non-remote tests to function sanely.