Have you checked into rpgobjects new Modern^20 system? I really like how charles rice changed things.