overhaul; using peru for vim components