TODO: Finish DLL separation Phase 1