Complete V3 Refactor (Alpha)