Stripped away unused stuff, begin reimplementing what was lost when my computer got wiped clean