Completely Refactored