Moved CLI out into new Module
Beginning work on the Indexer
Full index now works - not yet fully optimised from a design PoV