Cleaned up callout index and got locations working