Refactored, non-working commit.