Reworked Index

Lots of updates.  Forgot to make commits.