Testing
Speeding up query. Fixed some router things