reorganized, smaller index, needs work
Merge branch 'storm' of github.com:pelonpelon/sf-eagle into storm