FIX: Initial Refactor