Refactoring, initial deserialization of overview