Use RPC to communicate with the indexing process
Include CommandInfo in Inclusion
Clean up inclusions a little more