I recently had someone show me something that I think is a pretty damn good fix.
Feats.