WIP: Refactoring Errors & Requires of Third-Party stuff