Starting overhaul of Investment

Save a copy of perfi as perfi-old before I tear it apart.